From eafec813bfca6c1a3cf8d06fccd60b17fc3d4367 Mon Sep 17 00:00:00 2001 From: "kaf24@localhost.localdomain" Date: Sat, 19 Aug 2006 10:17:48 +0100 Subject: [PATCH] [BALLOON] Make /proc/xen/ballon contain driver_pages (aka "driver headroom") unconditionally. Signed-off-by: Gerd Hoffmann --- .../drivers/xen/balloon/balloon.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c b/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c index 98c76515d0..4cfc28c1d6 100644 --- a/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c +++ b/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c @@ -440,20 +440,16 @@ static int balloon_read(char *page, char **start, off_t off, "Requested target: %8lu kB\n" "Low-mem balloon: %8lu kB\n" "High-mem balloon: %8lu kB\n" + "Driver pages: %8lu kB\n" "Xen hard limit: ", PAGES2KB(current_pages), PAGES2KB(target_pages), - PAGES2KB(balloon_low), PAGES2KB(balloon_high)); + PAGES2KB(balloon_low), PAGES2KB(balloon_high), + PAGES2KB(driver_pages)); - if (hard_limit != ~0UL) { - len += sprintf( - page + len, - "%8lu kB (inc. %8lu kB driver headroom)\n", - PAGES2KB(hard_limit), PAGES2KB(driver_pages)); - } else { - len += sprintf( - page + len, - " ??? kB\n"); - } + if (hard_limit != ~0UL) + len += sprintf(page + len, "%8lu kB\n", PAGES2KB(hard_limit)); + else + len += sprintf(page + len, " ??? kB\n"); *eof = 1; return len; -- 2.30.2